conflictCommit
Merge branch 'master' of https://github.com/CommandoScorch16/IC1--Git-Practice