Add GPS Watch to sandbox
Created a simple model to reproduce merge bug