resolve merge conflict and whitespaces