Add packages and merge old conflicts from MBP