Removed leftover '<<<<< HEAD' from resolving conflicts