i realy dont know how to commit but i rolled back the changes and added new stuff
fixed origin remote conflicts