fixed merge conflicts which were previously lost