an attempt to resolve conflicts with followers branch