Traceback (most recent call last):
  File "./build/tools/releasetools/make_recovery_patch", line 53, in <module>
    main(sys.argv[1:])
  File "./build/tools/releasetools/make_recovery_patch", line 35, in main
    OPTIONS.info_dict = common.LoadInfoDict(input_dir)
  File "/home/ubuntusucks/CM12.1/build/tools/releasetools/common.py", line 175, in LoadInfoDict
    d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"], d["device_type"])
  File "/home/ubuntusucks/CM12.1/build/tools/releasetools/common.py", line 250, in LoadRecoveryFSTab
    raise ValueError("malformed recovery.fstab line: \"%s\"" % (line,))
ValueError: malformed recovery.fstab line: "<<<<<<< HEAD"
build/core/Makefile:1466: recipe for target '/home/ubuntusucks/CM12.1/out/target/product/ville/obj/PACKAGING/target_files_intermediates/cm_ville-target_files-4192ae4b61.zip' failed
make: *** [/home/ubuntusucks/CM12.1/out/target/product/ville/obj/PACKAGING/target_files_intermediates/cm_ville-target_files-4192ae4b61.zip] Error 1