Fixes #317 User Merge bug/problem