some commit
conflicts solved