The last commit was a fix for a mergefail

also removed test.jpg