removed weird shit from the unsynced commit merge