Put conflict changes back
Merge pull request #3 from engens/master

Put conflict changes back