Changes from two projects got messed up