Refreshed .idea folder, thanks Frank
Merge fix