@mennaamr remove "<<<<<<< HEAD" and all lines related to resolving conflicts.