Issue/67 merge changes

Less buggy implementation and makes more sense to handle in the Bucket not the RemoteChange itself.