push/pull merge fix