manually corrected merge bug (please make sure NOT to force a push and COMPLETELY RESOLVE CONFLICTS BEFOREHAND!)