corrected invalid merge