Removed strange merge errors.