Fixed some weird thing mixed up in branches