Revert "makefile conflits edits"

This reverts commit 18225182cecd5fceb4e853ac824f64abe0a23143.