fixed branch commit mixing