Added splice for better git merging