fixed stupid git merge error
try to put ship and tlep plots together