Resolved conflict with key containing "data"