update addBinary
resolve conflicts