removed merge conflict hiding in comment