cleaned up the indendation
Took out all the weird merge code (head ==== afjfjwefe)