removed binaries from git
resolved merge conflicts