user/goal image tests
user/goal image tests done
merge file conflict fixed