Completed First Part of Process Journal about the first model
merge conflict