Issue in conflict branch
Line causing issue in master branch
Merge branch 'conflict'

Conflicts:
	maths.c
Second line causing issue in master branch
Second line causing issue in conflict branch
Second line conflict merged