[oXygen-user] 3-way merge?