merge overwrote manual merge somehow, fixed