removed >>head
Fixing merge confilcts #154