commiting the third line after pushing the second S.O.P
resolve conflict