Fixed merge conflict

Removed Lockfile