Fixed conflict zzzzzzz

Signed-off-by: daitoshokan <gknoble@ucsc.edu>
Merge branch 'master' of https://github.com/daitoshokan/CuriosityonMars.git