Since I fixed all conflicts lets update to my branch