Updated with remainder function
updated with comment
updated with comment..
Added conflict comment
Updated with conflict comment.
Updated with conflict comment
updated with conflict messages
Merge branch 'conflict'

testing
Starting again..
 starting again
conflict comment
conflict comment
test
conflict msg
conflict msg
merge test