this is a new development
added new line 2
added conflicting line
Merge remote-tracking branch 'origin/devel'