not sure whats changed :/
conflict resolved
adding ignore file
adding ignore file