Removed conflict markers
Made tweaks based on @mwop's suggestions