fixing merge conflict on datawalk as a service