Commiting static html site after fixing merge conflicts