your conflict resolution also changed this .. I move this to the bottom because this is not need to use pull-right when you are using bootstrap for layout.