Fix Kproj that cause VS loading issue

Remove a few extra merge lines