FAIMS-869 Fixed conflict column visibility
Merge branch 'master' of github.com:IntersectAustralia/faims-web
Merge branch 'master' into qa