This is going to give a conflict when merging with master but it can be easily resolved by adding a new id then.