cleaned up merge markers; updated .gitigore files