fixed errors with merge