Fix merge bugs and REMOVE MANIFEST IN BIN FROM TRACKING PLEASE