Removed merge error stuff