5th commit
6th commit
confilict fixed
7th commit