need to commit before a pull, this may be interesting
fixed conflicts by removing binaries