Committing merging conflicts, removed mdf and log file from commits