merge conflict related improvements