Attempts to get back to pre-merge but allow merge ($*#*$% git)