merge conflict fix cont...