removed HEAD line which was left after fixing merge conflicts