Double checking the conflicts.. Frustrating..
Merge branch 'development'
Compiled less
.. what is going on
Merge branch 'development'
Adding style