Resolved conflict, added space