Git update can now deal with merge conflicts slighlty better..