Closes #3
Fixed merge by removing lock file