Initial commit
mergeconflict
Log major, minor