First Commmit
Fixed the conflicts add the log files to ignored