change committed
added
resolved conflict