removed additional characters added by merge