fixed errors in merging latex file