commiting conflicts fixes